Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 22 Apr 2012 00:53:32 +0000 (17:53 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 22 Apr 2012 00:53:32 +0000 (17:53 -0700)
commit539d07e956fd58c0055927b8dc9f9dd793dae2d4
tree95d1454c4a9b96c9090cfd5afaba37579d241472
parent6c0bf713eb9ab48056729387c224dcf341aab035
parent8ef6e2b09a08f9a6afc5f204b38e9352d9797db5
Merge from trunk.
14 files changed:
src/ChangeLog
src/alloc.c
src/buffer.c
src/character.h
src/dired.c
src/indent.c
src/keyboard.c
src/lisp.h
src/lread.c
src/print.c
src/process.c
src/sysdep.c
src/window.c
src/xdisp.c